Skip to content

feat(auto-merge): key on claude/ instead of codex/#28

Merged
ANcpLua merged 1 commit into
mainfrom
claude/auto-merge-claude-prefix
Jun 30, 2026
Merged

feat(auto-merge): key on claude/ instead of codex/#28
ANcpLua merged 1 commit into
mainfrom
claude/auto-merge-claude-prefix

Conversation

@ANcpLua

@ANcpLua ANcpLua commented Jun 30, 2026

Copy link
Copy Markdown
Owner

What

Retarget the fleet auto-merge surface from the OpenAI Codex connector to Claude Code. The owner is standardizing on Claude for agent-driven work and no longer uses Codex.

Changed both the canonical templates/auto-merge.yml and this control-plane's own .github/workflows/auto-merge.yml (they must stay byte-identical; the enforce-repo-settings sweep propagates the template to every fleet repo that already carries an auto-merge.yml):

  • Branch-prefix allowlist: codex/claude/ (copilot/ kept).
  • Removed the chatgpt-codex-connector[bot] approval clause.
  • Removed the now-dead pull_request_review trigger — its only consumer was the codex bot-approval clause.
  • Header + branch-prefix-policy comments updated to match.

Why claude/ actually fires (not decorative)

claude/ is already an established—if inconsistent—prefix across the fleet, authored by the owner via Claude Code (this repo's #18 claude/remove-brittle-automation, #20 claude/fix-retired-review-delete-404; qyl #432 claude/typespec-maf-prd-stub). There is no separate Claude bot identity (Claude Code pushes as ANcpLua), so the trigger is branch-prefix-only — same semantic codex/ had. A companion qyl PR authors AGENTS.md (currently a broken CLAUDE.md → AGENTS.md symlink) to encode the convention so the prefix stays consistent going forward.

Scope / safety

  • Auto-merge surface only — no branch-protection / NuGet / drift-check changes, no reviewer automation added (per AGENTS.md hard rules).
  • Left intact: the README "removed cron lanes" history (codex-review.yml) and the AGENTS.md advisory-reviewer example list — both accurate descriptions, not active codex automation.

Verification

  • Both files parsed with yaml.safe_load; asserted claude/+copilot/ present, codex/chatgpt-codex-connector absent.
  • templates/auto-merge.yml and .github/workflows/auto-merge.yml confirmed byte-identical.

Complete and verified for this repo. Effective fleet-wide on the next enforce-repo-settings sweep (weekly, Mon 17:00 UTC); qyl is updated immediately by the companion PR.

🤖 Generated with Claude Code

The owner is standardizing on Claude Code for agent-driven work and no
longer uses the OpenAI Codex connector. Retarget the fleet auto-merge
template (and the control-plane's own copy) accordingly:

- branch-prefix allowlist: codex/ -> claude/ (copilot/ kept)
- drop the chatgpt-codex-connector[bot] approval clause
- drop the now-dead pull_request_review trigger (its only consumer was
  the codex bot-approval clause)

claude/ is already an established (if inconsistent) prefix across the
fleet (e.g. this repo's #18/#20, qyl #432), authored by the owner via
Claude Code. The companion qyl change encodes the convention in
AGENTS.md so the trigger stays live.

No reviewer automation added; change is scoped to the auto-merge surface
only, per AGENTS.md hard rules. README "removed cron lanes" history and
the AGENTS.md advisory-reviewer example list are left intact.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

@coderabbitai

coderabbitai Bot commented Jun 30, 2026

Copy link
Copy Markdown

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: ASSERTIVE

Plan: Pro Plus

Run ID: cb868898-d13d-442a-8d71-88cd3db04ac2

📥 Commits

Reviewing files that changed from the base of the PR and between 1879c24 and 252b94a.

📒 Files selected for processing (2)
  • .github/workflows/auto-merge.yml
  • templates/auto-merge.yml

Note

.coderabbit.yaml has unrecognized properties

CodeRabbit is using all valid settings from your configuration. Unrecognized properties (listed below) have been ignored and may indicate typos or deprecated fields that can be removed.

⚠️ Parsing warnings (1)
Validation error: Unrecognized key: "tools"
⚙️ Configuration instructions
  • Please see the configuration documentation for more information.
  • You can also validate your configuration using the online YAML validator.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch claude/auto-merge-claude-prefix
✨ Simplify code
  • Create PR with simplified code
  • Commit simplified code in branch claude/auto-merge-claude-prefix
  • 🛠️ repair automation
  • 🛠️ cleanup stale review automation

Comment @coderabbitai help to get the list of available commands.

@ANcpLua ANcpLua merged commit 966910e into main Jun 30, 2026
3 checks passed
@ANcpLua ANcpLua deleted the claude/auto-merge-claude-prefix branch June 30, 2026 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant